Updated used bean names. Modified tests. Added logging.