Adding test for #363
Solving linter warnings