Resolve issues with tests and API up to this point