some fixes, and adding a new test for injection