virtualenv + service tests update
merge fix
merge