Fix aliasing, eval* commands processing, added tests