Refactoring based on changes made while separating projects into api,
test, and impl.