Reorganized tests to match library layout