fixes for UUIDManager + tests.
Merge pull request #183 from superfell/master

UUIDManager fixes + tests