reoganize test a bit; README update