updating tests, minor comments