coverage w instanbul, minor fixes, better tests