Added test nbs to setup and removed todo