Although I don't know what's "bad" about the original test -- @bgrant ideas?