ACT - 1644 -
Tests improved and added verification to form values