Some changes to test handling to set correct zon for cards in library.