Update test suites and fix various new bugs