tests, refactor