updates tests and fix up indents