CR fixes; allow tests to be in separate files