v3.3.1 Updated classes to fix bugs in tests from last commit