some spec cleanup (utilizing factories)