Correct ids and added a test