Updated to use junit