Increased test coverage. Added slf4j logger for debug / error logging.