Tests are better but still do not pass