Do some fixation on samebug.
Tracekit added for tests.