Test and refactor.

Preliminary testing code for non-blackbird-specific classes.
Also, refactor.