Mutant specs

ran mutant through the code and made the tests more robust +120/-21
tweaked a little in the code +12/-20

the only remaining mutant issue is the :in parameter - which does nothing. Will open a separate PR for this one.

/cc @jrafanie