Testing and cleanup of the devel tests

devel test close to feature complete.