Point tests a other minor cleanup