Master branch only includes working scenarios