Fixed virtual methods, all tests work now