some fixes in Core/Kernel + unit tests files