Cleaned up test names. Added here factory methods.