updating passing tests
merge