Testingfixes