Advanced overloading removed from main function, not reliable
Test fixed for same reason