Fixed test scenarios and the use of preload view
Fixed conflict