Wrote remainder of tests for public api