For #18: fixed failing tests and corrected copywrite on new files I added