Fixed different issues from discussion
Fixed a Spinach Test which had now 2 New buttons