Add Tests for Core