Got tests passing