WIP: tests + fixes + love

@lukemelia is that ok?