add content-type keyword, and add some unit test for core.