Tests: Fixed for latest commit