Adding coverage tests, adding support for interfaces also in the hydrator for consistency