Add metadata requests
Refactor/add unit tests for request classes