UBS-Test

Added new unit test cases