Simplify test setup
BROKEN: in the process of adding error handling

Had to commit this, because I need to use these changes on another
machine