Cleaning dev helpers and test fixing