Got initial tests to pass