Updated to use Junit