fixed test cases due to dynamic ids
minor test-fixes