Tests

This test brings test suite up2date for 0.9.6 release.