Commented unecessary code
Added behat