Adding tests
Updated comment text
Added saving and restoring instant state.
Attempting to get travis build to work again...