Some cleanups and test code