Added tests and some fixes for the core artifacts.