Still work in progress, anyhow tests are working all fine.