new-features: Add tests for new features. Add few small fixes