Fixed name camel case
Cleaned assertions
Removed old 'use' statements