Added some complicated loop and add board tests