Fixes #167 and adds temporary test