Majorly cleaned up specs and scopes
I added some missing scopes and cleaned them up.  I also completely
filled out the specs and further DRY'ed them up. NOTE: the between
scope has changed.  It is now inclusive and not inclusive only on
one side.