Fixed more stuff. About to busy myself with object dependencies for
the test executable.