first all green in tests
Fix types handling