#636 comb over starts
#636 changed default port back to 8080
- disabled problematic tests for now.
Merge pull request #637 from joola/feature/#636

#636 comb over