Make corp tests part of @core and update target names