Reverted specs until further checks