Code completed, writing tests