changed methods and tests