added all to chain
also updated tests