add test files etc. for issue 32