Make Washi a factory. Fix tests