fixed incorrect method invocation and tests