Fixed some stuff to make tests work with the changes in master
fixed tab/space problem