Fix and and tests