Continue working through tests.