remove dummy code
fix tests