Refactor tests
More tests