added ZABUZA_TEST_FLAVOR_ID and ZABUZA_TEST_IMAGE_ID for actual tests