Moved funclions back to nac, added messanger tests