Some additional fixes, updates, and new tests