Added testing classes and half-working test