Fixed remaining unit tests- Temporarily Ignore Integration tests