increased test coverage to 96%