(#342) - Remove various cruft from test setup

For various reasons I want to get the notion of adapters removed from the tests, started by removing some unneeded / nasty stuff