Initial round of test fixing

[alcueca]

Tightening the test suite will help me understand the codebase, and allow for easier refactoring later on.

[alcueca]

The changes so far amount to:

• Code style fixes
• Variable renaming
• Commenting out unused code
• Adding comments for future asserts