Cleaning up unit tests and adding copyright headers