Fixes tests

Fixes tests that were recently broken.