new Tests+updated core