deleted depricated methods, improved test coverage