add expected.xml and move methods