update test, reorg. samples