Fixed existing tests and add required user method