refactor tests part 1

refactor tests into fqn, use uuid lib, clean out dead code
Refactor tests into fqn, use uuid lib, clean out dead code