Fix tests

Round 2.