Fix unit tests and method signature due to last PR ...