Revert "move test"

This reverts commit 66e557e619d6d35e65f1d0b8d197cee6e7b60bd6.
branch test 1
include cleanup