Minor changes in build configuration. Renamed test files.