A few more tests to wrap up for now