Update Makefiles to stop on errors.
Update test configuration to reflect last changes.