Fixed merge: test placement and name