Configuration
Bugfixes
Set up tests