cleanup exception
fix tests