Tests and NormalEngine are added