Fix tests

victor did all the work.... so merging his mistake and fix to show his work (his credit)