#520: change properties, add test
#520: change tests