Fixes in Unit Tests