Adding test cases for both Josh Kelle and Vaibhav Gupta