adapted assertions to Tonios changes