Some new tests and other minor changes
Some fixes for the 0.6.2 release