Simplified and tidied up test code. Also moved the (point-entry)
function to the shapes namespace.