Modified junit for issue#416