Mark as required the non-Option fields

Adding unit test to check if the non-Option fields are marked as required.