Migrated test to JUnit4
Added another valid license header