Update layout injector and test cases; revise supported fragment injection