Moved testdoubles to correct package