Removing configuration

More tests
Some fixes