Moved the final derby research code to unit tests