Removing test annotations from private methods
Refactoring tests a bit, really need to separate out unit / functional tests...