Finished Domain Storage, Improved Testing

Testing is still a bit messy and could use some refactoring but a lot
more code coverage now