First working behat tests
Slight tidy up, more tests