A few extra things to test for