tests + minor changes