Fixed tests due to test id renaming