Fixed issue: Removed test for for a non-existent class
Fixed issue: Minor cleanup
Fixed issue: Fixed UnitTest bootstrap