Upgrade to 2.10, fixed a few issues, cleaned up tests, etc