Add logic andf tests