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