removed more buttons and added a unit tester class