Tidy up of test resources, and remove cheeky logging from test

Change-Id: I361c52c4793fef9262961d9be1732bc4ac9f3f97