Checkpoint commit - adding some tests and a few tweaks to the model-form for pulling out input values