Now with passing make test