More tabs to spaces. Tests all pass.

Wasn't sure about these files, but seems good.