Broke tests down to more discreet units, added some new tests for new features.