Removed useless tearDown, removed annoying spaces and parenthesis
Merge branch 'develop' into colander