removed empty specs.
added various spec helpers from a generator, then removed said generator
specs passing
using spring to make better time.
fixed merge