Bug fixes in Test V1.2

Bug fixes in Test V1.2