More changes that involved bussines rules
Test Cases