Refactor tests to use before blocks
Rename configuration options so they are clear
Amend whitespace