updating some tests with changes from latest code