Adjust tests implementation to new fixture interface