create test environment
fixes merge conflicts