Added more extensive testing.