moved some tests around and some other stuff