Fixing Tests and added Travis Support