Added test framework changes and some changes in order to show correct
data on client