Added more extensive testing