Using functions instead of methods, fixed tests
Changed version to match existing dependency