Started Adding jUnit tests