Merge pull request #426 from dubek/extra-step4-tests