Changed the order of files so the order of tests matches dependencies.
Reverted changes c0d81a976428cbb1b297a76719848d33e18df7f7 and fe7cb819d187c411a1c5c09784899598baebddfb that introduced a lifetime issue.
Added unique id accessor to array.