Test refactor and cassette updates