new tests + slight mods