added keys and minor changes in core unit test