tests, fixes etc