Refactoring to the finalised test specs