... and fix method name in unit tests