mod to add default data sink and test