Tests/fixing2

Made the tests workable again. they pass all now. @ssim @mklauser - ready for merge?