reorganized tests and added more