Converted dsl into an injected approach rather than hardwired
updated fx tests
Updated tests to be list driven rather than tabular