Updated unit tests using jeffsaracco's branch and updated formatting of src.