Added cases for core unit tests and implemented corresponding core functionality