Housekeeping (and uncommenting some tests)