adding aliases, improving tests