removing some test scenarios and update methods