fixing the test, moving the static methods as standalone methods