Reorganize tests to reflect reorganization of logic