gustafn
committed
on 18 Jan
cleanup test

use more compact idioms, remove useless code, etc.