Cleaned up hooks and started success testing