* Testing fixes for comments issue