Add units, update tests, move to new package to avoid XogenyTest dependency