added a test in master
modified othertest within master