Fixed failing scaffold tests. Removed dep on javaee addon