This class is currently not covered by unit tests ... please add one.