Added some methods. Modified tester.