Refactor initial tests