getting tests running again... almost