reorganized some test cases and put/cloned them into other packages