Test Harness
Adjustment
Update solution files
Merge branch 'development'