Fix initial tests. #339