convert tabs to spaces
fix test
fix typos