added some more tests, a test harness, and also changed some annotations...

... on the models