moved bypass_test()
simplify
simplify
simplify