Added a few tests, and started recreating the utilities.