Slightly improved the tests
Updated the copyright information
Code cleanup