added test, cleaned-up
cleand-up properties