a load more tweaks getting test running
tweaks