Core tests - 90%