Adding jUnit tests