before merge with Camera Test