unit and acceptance tests added [pqpham90]