reworking the test to be an integration test
simplified the return structure
fleshed out the update test
getting rid of the duplicate declarations