reorganized tests a little