Updated unit tests and noted breaking API change