Merge "make test non executable, otherwise nose skips it"