changed src dir for testing, changed some methods for testing, added tests