Test in right order and added extra info