Add failing test for the second part of the issue
Fix failing tests