Begins to add unit tests