Fixed overloaded method, fixed obsolete test