=act,tes Small TestKit cleanup
Merge pull request #2042 from jozic/small-testkit-cleanup

=act,tes Small TestKit cleanup