playing with dummy trying to figure out changes needed...
some tidying + few tests