Got initial tests working