lots of tests & additions relevant to the future