Update some tests to work better