Bring tests back in order
Add more tests
Add travis