Still working through how the puzzling logic should work with tests