Fix coveralls, fix some others tests folder moves

Author: peternewman

.travis.yml

@@ -77,11 +77,11 @@ before_install:
  - if [ "$TASK" = "compile" -o "$TASK" = "doxygen" -o "$TASK" = "coverage" -o "$TASK" = "coverity" ]; then ./install-gmock.sh; fi
 
 after_success:
- - if [ "$TASK" = "coverity" ]; then cat /home/travis/build/${TRAVIS_REPO_SLUG}/tests/cov-int/scm_log.txt; fi
- - if [ "$TASK" = "coverage" ]; then cd tests && coveralls --gcov /usr/bin/gcov-5 -b . -e include -e harmony -e mocks -e config.h -e system_config -e tests --gcov-options '\-lp' --follow-symlinks > /dev/null; fi
+ - if [ "$TASK" = "coverity" ]; then cat /home/travis/build/${TRAVIS_REPO_SLUG}/cov-int/scm_log.txt; fi
+ - if [ "$TASK" = "coverage" ]; then coveralls --gcov /usr/bin/gcov-5 -b . -e tests/include -e tests/harmony -e tests/mocks -e config.h -e tests/system_config -e tests/tests --gcov-options '\-lp' --follow-symlinks > /dev/null; fi
 
 after_failure:
- - cat /home/travis/build/${TRAVIS_REPO_SLUG}/tests/config.log
+ - cat /home/travis/build/${TRAVIS_REPO_SLUG}/config.log
 
 
 #No notifications for now