* Refactor unit test  classes
* Update license headers for moving classes