Fix create and update methods in R3

The create and update method implementations in R3 are returning R4 objects instead of the corresponding R3 objects.

This ticket deals with fixing these along with some code refactoring to remove unused imports and improve unit tests.