Made tests pass artificially, added coverage.