Fixed minor problems with not passing test