Fix regular expression for core types and add test

Fix regular expression for core types and add test #36