Fixes for failing SEATS test cases