fixup some tests and samples