add sample data and fix tests