Tests passing now.