jUnit tests structure updated.