Fix initial tests