Integration Testing + Bug Fixes.

Added optional Delete process.