refactored tests and changed dependencies