Features/seperated tests

Split the tests out. Bascially predicated on no big features being outstanding at the time.