[Issue #210 #75]fixed tests