Fixes tests (logic) bugs for v1.1.3