Misc test, cleanup