Fix and cleanup tests, return to previous hasOwnProperty as that was not the problem.