spec tests have been refactored to be cleaner.