moved method wrapping into separate test file