Fixing some tests
Starting some new feature