partial fix for dev_tests