Finish writing tests