Re-group tests for readability
Add test to fix rather non-regular behaviour