Added unit and integration test to Test Suite