merged branches, added test case file