Make it works in the testapp