Updated tests, improved display