Made clache work, fixed most tests