Finished the remaining pending specs