Added some tests - they have not been run.