Adapt unit tests