Update functional tests to test for None image ID also