Fixed test generator for aliasing and refactored interfaces a little bit