#41 Adding test; Actual issue was fixed by previous refactorings