Almost done with tests