Fixed some issues with empty states and added to tests.