Completed Unit tests and helpers.