Fixes most of the OCCI tests.