Fixes and enables test cases again