Updates to the classes
Test Cases