Increase tests to 26, 7 unimplemented