Small refactoring
Hardening tests and skipping a possible issue (why I am doing this??)
Clean implementation