WIP: tests + fixes + love

nah... ya you are right, I forgot good catch.