refactors some tests