Forms changed and tests fixed