Move test core package back to right spot, change cosmic id to 'HotSpot.ID' for compatibility with solid tumor annotations