Massive work on tests + minor fixes