Updated tests to use the static ids.