Added ForNullOrEmpty and refactored some tests