TK tests

Integrated TK to make it easier to dev & test in the future.
Plus updated the concrete.mk file