Removing dependency of hardcoded id on the test