Update Makefile with new dependencies and build
Add tests for FileStore read and write
Fix travis tests