Fix test data and make room requirements mandatory