minor changes + test update