first steps to modifier splicing
minor test changes