Make config errors explicit
Reduced long line length
Separated tests out into sections