WIP generator tests
Merge pull request #15 from ironcladlou/deployconfig_generator_tests

Test fixes