GH-8, GH-18: Got unit-tests and most funcionality (except download) working after the refactoring.