Hey,

So I'm on some antibiotics now :|

- almost finished tests for #312

- reviewed #96 to some extent, while I couldn't properly review #284, left comments

@Xavier, re. ticket updates, you mean to post e.g. "Updated tests", even tho there is no commit pushed?