fixed as much as details as possible to comply with unitary tests