Travis update and additional headless tests

Fix #51
Fix #52