add tests and remove API refs