Made more fixes to unit tests