A little bit more robust of tests showing different entities
Whitepace cleanup