Merge pull request #2349 from evverx/test-functions-cleanup
authorDaniel Mack <github@zonque.org>
Mon, 18 Jan 2016 09:51:19 +0000 (10:51 +0100)
committerDaniel Mack <github@zonque.org>
Mon, 18 Jan 2016 09:51:19 +0000 (10:51 +0100)
tests: various fixes


Trivial merge