Added junit for Issue#385