Adjust old test to fit to the current situation