Add pic tests and some formatting