improves test and adds some suggestsions