Ironing bugs from unittests