Adding parameters
Fix title test
Cleaning up the mess