New tests passing now.