Adding tests
And travis
Changes for tests