fixing a bug where we'd ask shared even if it were passed as false
Revert "fixing a bug where we'd ask shared even if it were passed as false"

This reverts commit 04631e1356c387e656ecfe794c8ad31af064b592.
Improving error message on the validator - just a bit more helpful when I'm doing tests
Fixing a number of tests!