changing more tests to correspond to new boundaries
Merge remote-tracking branch 'origin/master'