Fix RxJava Groovy Unit Tests after static method refactor