Fix runtests
Cabalized test suite