removed some non-vital test helper objects