Added missing include
Fixed ASSERT_THROWS
Added unit test for UIDs