Fixed some tests so they now compile, some may still not work

And duct-tape is not a good solution