Updated classes and test to show behavior