Cleaned up test data. Changed coordinate use of 'long' to 'BigDecimal' to ensure that no precision is lost.