This new class is currently not covered by tests ... can you add at least one?