Merge "Moving framework core tests closer to their source files."