Enabled some failing unit tests again