Improving the use of identifiers for integration tests

DO NOT MERGE

Example for:

https://www.pivotaltracker.com/story/show/79009208