Small improvement to the handling of building unit tests