Submodule
Simplify test code
Debug travis failure