2 more functions and tests added