cleanup && a bit of test work.