updated copyright notice and test refactoring