started #1220
fix tests