Unit tests...
Cleanup for Travis...
Fixes for Travis...