Reorganised tests; cleaned up.

In this release, we did 2 things:
1. Renamed objects, variables, methods for clarity;
2. Refactored tests completely — now they use unittest.