Changed the extended class with our own test class
Merge conflicts