updated tests s.t. they respect the latest changes in our code