tuned up some tests