Add generic tests for Core