@kevinchugh added these test cases per your recommendation, thoughts?