New Test cases, fixing bugs