added a few tests
minor progress
Mostly done, need ot get the exception working