First take on fixing and updating unit tests, references #63 and #65