Merge unit test structure over from EDD again as it's been simplified