Add some specs fixes
Add tests coverage

Works only on >=1.2 RCs for now.