Additive tests and fixes