suhojm & pshahi92 unit + acceptance tests