Spec file now split into two; one per class.

Note the differences in files being `require`d in each spec.

RSpec: 21 examples, 0 failures