Initial working test wrapping