Overhaul 1 made simple test environment