Adding Given/When/Then where they are missing