Core unit tests updated. 97.5% coverage reached.