More tests, fixes, and performance enhancements