Some cleanups
Some cleanups - again
Added some tests for Tracee-API