Fixed tests to correspond with new intended behavior