More tests, some updates.
Converted tabs to spaces.