Merged big change from phmLabs
Fixed uuit tests