fixes #1085
attempt to make some tests green
Merge branch 'devel' of https://github.com/Araq/Nimrod into devel