minor adjustments and more tests