Merge pull request #40 from AltGr/internal-solver

Re-enabling big-upgrade expected failure
Fixed the 'expected failure' for travis