Modified the first behat tests and some views