Align datasets for testing, fix bugs.