Updated Travis file and added additional tests

Fix #51 
Fix #52