- cleanup
 - enable regression tests