added test coverage and remove unnecessary dependencies