Adding tests.
Added tag 0.8 for changeset f0a5b6e63c4b