Refactoring whee from Junit to Feedback
merging complete