added tests for empty and non-existant entries