reorganized tests and got them running