test changes

There are several issues in the next few tests identical to ones I've mentioned above. Please go over them.