modified unit test
merged master