removing unused methods, adding test 17