expanded test scenarios to be more thorough