Moving back to working test suite