More fixes for unit tests
Merge branch 'logg/fix-issue-42' into next
Merge branch 'next' of bitbucket.org:fenics-project/dolfin into next