schema rb
fix tests