Adds jUnit test case for manager class
Renames junit test.
Adapatations of the latest core changes to UI project.