Added more tests, updated copyright notices, removed unnecessary imports