Updaiting core unit tests