Updated tests, improved display
Merge pull request #8 from AltGr/up-tests

Updated tests, improved display