Improved helpers, started testing Aidir class