Add tests. Upgrade structures
Add travis tests