Merge "Rename unittest files to prepare for coming of integration tests."