some functional tests added
tests/functional/tests: use alt. to assertIn

assertIn is new to python 2.7. Since we're using pytest and we want to
support python 2.6 as well, assertIn calls be replaced with
`assert a in b`.

Conflicts:

	zvshlib/tests/functional/tests.py