Added some more tests - work in progress.