Implements first test set - incomplete
Improvements to CB2014 - tests not yet passing