Some testing fixes and a scipy install fix