Partially update tests -> they can be compiled again, they won't run yet, though