Restructure test structure and update travis script