Fixed tests that broke due to new button images and some test refactoring