A quick Fix to get the existing tests running.