Tests Review and fix