diego/zhen units and acceptance tests