Implemented: Added temporary dependencies to Sahi.
Fixed: Migrated to Sahi for Behat tests and removed work arounds.