Cleanup tests(use port 4000 which seems travis-friendly),version-bump