Merge "Added Unit TCs, Error handling, Minor Bug Fixes"