Added additional tests and removed unused class