Convert other tests to tape & fix