Get unit-tests running again (90% done, some tests commented out for the moment)