Refactored Test source files.