FIXED: Changing added states to False screws up expect vals

This should not be the case, so will debug it later.