Some tests probably fixed, not all