#105 refactored the state model to use more atomic atoms, we should now add tests to these files
#105 refactored the state model to use more atomic atoms, we should now add tests to these files