Additional tests, getting ready for 0.5 release