Revert "Movement of TestController to a more apropriate place"

This reverts commit e366f115c34e2d02f64538b1c3eef84fab177ef3.
Small Changes, recommit of previous evaluation implementation