Updated test for JUNIT4 and added in apache headers