Fixing Unit tests and JavaDoc