Start of API + testing changes.