updated jUnit tests