Enhanced display and added more tests