Fixing dev tests