changes to unit tests and more api builder scaffolding