Added fwe Enhancer tests. Fixed some issues found using them