Integrate CommonCTest, Fix #258, cleanups