Exception support and Integration test added