Updates from few implemented tests as well as formatting improvements.