Latest test/code updates