Working on making tests pass

Probably will need a bit more refactoring
A pile of refactoring on the tests to clean up cross talk
Modifications to the nodeStore tests to make them more meaningful