Changed peer schema and added additional tests