Fixing unit test # 1
Fixing some unit test before continuing