Final

changed tests, fixed aliasing