Tweaks after writing unit tests