Cleaned up tests while experimenting on the right API to expose.