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