adjusting tests to match updated code