Annotated API DAO test functions with @covers annotations
Extracting statements from if conditions in API DAO code to increase readability