Added Integration/Unit tests