Retrofit old tests to cope with new design