fixed tests to work with new looping context