Added more tests, updated Sundara.