Added class and testing structure