Renamed test, and made it a little more flexible