Stubs and tests minor cleanup