Fix bug #1, added missing moadl to delete test.
merge from remote master