Test in place
Adding more tests
Removing dependencies