add test stubs reorder functions