consolidating Points, adding tests