Added test data;fixed errors;