Merge "Move framework test-runner unit tests to be closer to their source. Move the test-runner source into a separate src folder to accommodate the test move."