Make https://issues.jboss.org/browse/FORGE-86 work again. Testcase

Somewhere along the line, the fix for https://issues.jboss.org/browse/FORGE-86 stopped working due to some package renaming in solder and @Singleton not working anymore... Fix included. Testcase pending so it wil not happen again