improving analyser and tests