Add missing test runs and fix some tests