Moved data, refactored tests

Also updated deps and .lock file and some readme changes