Added another test and updated some of the copyright notices