Got tests working