Fix tests and move data