Added convience functions and tests.