Merging development and test environment