Refactoring tests and removing whitespace from fact