Added tests. Moved Point to new file