move test ordering around
don't do magic
add in more reliability tests, currently broken