Add stubs to test
Cleanup