Akampa/Faris | Added more test scenarios.