updated and refactored tests