Rewrote relevant tests with the updated class names