Add alias methods and associated tests. Add some more tests.