Fix all test. Made public