Fixed tests and changed core comment