Fixing up test environment