Added more extensive tests