changes to a few tests to make them more strict