changed order to use uuid
removed old test that is no longer valid