Refactored tests
- fixed indentation
- cleared unecessary context
- added line breaks
- refactored messages
Merge pull request #59 from onweapps/master

Refactored tests