Added some basic datastore tests
Fixed bug with error remaining after leaving page