Fix last tests after state handling rework
Change use of syntax
Fix consistent syntax
Remove repeatNext for virtual function overloading