Fix test/devel tests