Fixes some failing unit tests and adds a custom fields response ot the test responses