Testing + removed redundant classes