Cleanup testing facility, add make check target