Add fixture support through clos-fixtures
Remove osicat dependency