Fixing test and devel