Added some empty-data testing