#40 some fix and new test which fails. This should be worked out.