Updating test.
Making btest-include test names portable.