simplify testing and improved output
Merge pull request #85 from cebe/simplify-tests

simplify testing and improved output