Added dependencies to JUnit.
Applied some fixes from code auditing (some sections have been commented out and are marked as 'REMOVE').