#666: Testing for feature branching