refactor cycas-test package