Better data import, added tests and compressed image