Remove override keyword and pass all the unit tests