remove unwanted code from tests
some minor tweaks to test file inc a rename