A few small tweaks and new tests