added layers and tests