Address test and refactored db annotations.