Add behat context & make time options work