rhbz988202 - simplify class and test