SITE-326: Fixed Build and JUnit issues...

Created a New Branch TEST