adding more flexible test, removing a couple unneeded requires