EA_TEST Final fix for the white belt test repo -- This commit should make it all ok