Refactor some tests
Move and refactor last couple of tests