Cleanup some spec tests, added coverage report