Refactor
Added fixtures for more cases
Refactor