Make tests pass without fatal errors