Fixed tests to comply with the new seprated questions and answers sample data