tests and assym
fix merge comflicts