[Issue #75 #210][WIP] fixed tests