Add Guard, order specs, fail fast