cleaned up unit testing and changed users somewhat