have a working test
cleaned up spec_helper
solved conflicts
resolved conflicts