Update some tests to be more constrained