Bug fix: Properly adding multiple fields
Expand functionality of isPrimaryField()

It now accepts fieldBuilder objects as params
Correct method docs
Expand and fix tests