Just added lots of tests to cover those.