Bit more testing, cleanup