fix/update some test cases; update copyright statements