Modified Classes and created Tester class

debugging needed