address test clean_fields and refactor + spec home check