Wider testing, slightly more logic, fixed every_nth_pair

Change-Id: Iee9fa75c7fb503543eb71e00bac491d5e565162f
Signed-off-by: Filip Wieland <filiplamparski@gmail.com>