Attempting to reduce size of tests