add aliases and some tests