Add factories; update specs

Removing the simplecov details as well. That was a mistake to include
them in the first place.