Added different forms of AND and ADD to tests