Fixed some unit test issues + merge errors