Added test and sone formatting