Bugs fixed + some unreleased (yet) test added.