Tests now pass. Hooray.