Adds tests missing from previous commit