WIP

Restored most of the failing tests