Fixed minor testing stuff. Added realmId (not very correct) as a feature to Athena.