Smaller changes & Fixed unittest 2