Updated unit tests to deal with new validation logics.