Test class added, working on it