Progress w/ tests.