Switched to universal tab indentation

Switched to universal tab indentation. Also added minor tweets to testing.