Added class and finished test