Updated to test more cases