(#342) - Remove various cruft from test setup