Adding data and fixing builds and tests