Fixed tests to properly reflect the class changes