Add self for testing