Fix failing build test and add another build test.