Some tests still needed