added Test Buttons, removed tests, updated testUtils
merge