- refactored tests, added more