enabled and fixed testcases
potential null pointer
changed visibility
added method to see if the two elements are empty
testcase fixes