More tests

Not ready for production. but I like to share.  Don't press merge!

Any thoughts?