route tests removed
conflict fixed
some work done but I did not find a fine commit message
comment renaming