methods and tests added