A few more tests and updates

A few more tests and updates