Addresses #6152 testing for DEV AND DEV ONLY